From: Kenichi Handa <handa@etlken>
Date: Fri, 23 Apr 2010 02:17:09 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~19^2~23^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=59e809d1d220262dcadebbf84bc97cc418f99464;p=emacs.git

merge trunk
---

59e809d1d220262dcadebbf84bc97cc418f99464